Bug 628936: Minimal change to pass introspection.

gobject_introspection's G-ir-scanner doesn't like the -xobjective-c
option needed to compile ObjectiveC features in quartz implementations
of certain gtk functions. This rearranges the compiler flag environment
variables in Makefile so that G-ir-scanner doesn't see them.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index c82cb56f161d634c5987791f0144124c03ae7773..e197c73ebcde41929407c232bbbf99b41f56a29d 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -54,7 +54,6 @@ AM_CPPFLAGS =                                         \
        -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED          \
        $(GTK_DEBUG_FLAGS)                              \
        $(GTK_DEP_CFLAGS)                               \
-       $(gtk_clipboard_dnd_c_sources_CFLAGS)           \
        $(INCLUDED_IMMODULE_DEFINE)
 
 if PLATFORM_WIN32
@@ -793,7 +792,8 @@ if USE_QUARTZ
 gtk_private_h_sources +=       \
        gtksearchenginequartz.h
 gtk_c_sources += $(gtk_use_quartz_c_sources)
-gtk_use_quartz_c_sources_CFLAGS = "-xobjective-c"
+libgtk_3_la_CFLAGS = "-xobjective-c"
+
 else
 gtk_c_sources += $(gtk_use_stub_c_sources)
 endif
@@ -806,12 +806,8 @@ gtk_clipboard_dnd_c_sources =      \
        gtkdnd-quartz.c         \
        gtkquartz.c
 gtk_clipboard_dnd_h_sources = gtkquartz.h
-gtk_clipboard_dnd_c_sources_CFLAGS = "-xobjective-c"
 else
-gtk_clipboard_dnd_c_sources =  \
-       gtkclipboard.c          \
-       gtkdnd.c
-gtk_clipboard_dnd_c_sources_CFLAGS =
+gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c
 endif
 EXTRA_DIST += gtkquartz.h